1d2bc96b1d25197b4911ece4d1dc6b488de5a003,clc/modules/object-storage/src/main/java/com/eucalyptus/objectstorage/ObjectStorageGateway.java,ObjectStorageGateway,setBucketAccessControlPolicy,#SetBucketAccessControlPolicyType#,934

Before Change


            AccessControlPolicy fullPolicy;
            //Expand the acl first
            if(isCannedAclPolicy(request.getAccessControlPolicy())) {
                fullPolicy = new AccessControlPolicy();
                fullPolicy.setOwner(new CanonicalUser(bucket.getOwnerCanonicalId(), bucket.getOwnerDisplayName()));
                try {
                    fullPolicy.setAccessControlList(AclUtils.expandCannedAcl(request.getAccessControlPolicy().getAccessControlList(), bucket.getOwnerCanonicalId(), null));
                } catch(Exception e) {

After Change



			// Check for the owner
			if (request.getAccessControlPolicy().getOwner() == null) {
				fullPolicy.setOwner(new CanonicalUser(bucket.getOwnerCanonicalId(), bucket.getOwnerDisplayName()));
			} else {
				fullPolicy.setOwner(request.getAccessControlPolicy().getOwner());
			}